From 8210223895ec05dd77b13c35c79cce432f56e4fe Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 27 Jan 2024 13:25:02 +0000 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 553129 -> 553438 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 9751abf04d3..7b8d4583fb2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -359,6 +359,7 @@ export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index 941ee8461be8d91181966c3f7a1506098ead759a..15e4e039e6f2d05a1791bc8c40bb8579d1cb8230 100644 GIT binary patch delta 224 zcmZ4aQ1RYl#fBEf7N!>FEiBWwOb^`3Br^R#C!4UDmt&Ztr(cL`P(Y9?kW|PlRwymb z%u81&$w*a*N-fG)2=k5A49ULeE1 z{oods2*&Aa)-!VofSeTXfiPuyp%6>JbOm8nmgxq&Sh(6tx3K^*D-g47FWts&vI_t| C*-0$` delta 64 zcmccjSaIb;#fBEf7N!>FEiBWwOy6{kU1suyM)t`IWZ1Xg-pUfeIDM5Phv)PF5mwIj T1>0GGm=%cGwlCPuZnp~njSd@J diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 073f048998f..30c56dca268 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2